run-with-locales: Spell UTF-8 locales in the way the script understands
authorSimon McVittie <smcv@debian.org>
Sun, 1 Mar 2020 15:20:49 +0000 (15:20 +0000)
committerSimon McVittie <smcv@debian.org>
Sun, 1 Mar 2020 15:20:49 +0000 (15:20 +0000)
Gbp-Dch: ignore

debian/rules
debian/tests/installed-tests

index 52b2afd5df6179669b04bfeb3b0db31d2dc36b02..3066dea9bbc38a0ada18b391eec4074e555f1de0 100755 (executable)
@@ -184,9 +184,9 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
        env -u LD_PRELOAD \
        xvfb-run -a -s "-screen 0 1024x768x24" \
        debian/run-with-locales \
-               --generate de_DE.UTF-8 \
-               --generate en_GB.UTF-8 \
-               --generate en_US.UTF-8 \
+               --generate de_DE.utf8 \
+               --generate en_GB.utf8 \
+               --generate en_US.utf8 \
                --generate sv_SE \
                -- \
        dh_auto_test --builddirectory=debian/build/deb -- -k 0 -j 1 || true
index 83b57ea25e1450514be06845d9c806094d9e383e..426a33130a739574b33dd711bd382e8c6b1122b0 100755 (executable)
@@ -14,9 +14,9 @@ export XDG_RUNTIME_DIR="$AUTOPKGTEST_TMP"
 exec dbus-run-session -- \
 xvfb-run -a -s "-screen 0 1024x768x24" \
 debian/run-with-locales \
-    --generate de_DE.UTF-8 \
-    --generate en_GB.UTF-8 \
-    --generate en_US.UTF-8 \
+    --generate de_DE.utf8 \
+    --generate en_GB.utf8 \
+    --generate en_US.utf8 \
     --generate sv_SE \
     -- \
 gnome-desktop-testing-runner \